Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:47:33 +0000 (07:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:47:33 +0000 (07:47 +0000)
commitbc13ddb8c7fbe4b86fedd4b2fc53bf678066a27c
tree4cb2a4c470db0396437121fb7527e0da0f2c2928
parentaa6f614e6e48d6d716423a2f75e68f5868e51f15
parente06231292946267d141ffdebd673dac92a7005fb
Merge from mainline.